From: Carlos Garnacho <carlosg@gnome.org>
Date: Fri, 16 Jun 2017 16:21:34 +0000 (+0200)
Subject: gdk: Set vid/pid on wayland tablets
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~498
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9e740bd4355ac57b97fd6698fa5da27cf2be89ab;p=gtk%2B3.0.git

gdk: Set vid/pid on wayland tablets

This was missed so far... Use %.4x format, in order to behave just
the same than X11.
---

diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index c9eea731eb..33ecf404a7 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -2866,6 +2866,10 @@ tablet_handle_done (void                 *data,
     GDK_WAYLAND_DEVICE_MANAGER (seat->device_manager);
   GdkDevice *master, *stylus_device, *eraser_device;
   gchar *master_name, *eraser_name;
+  gchar *vid, *pid;
+
+  vid = g_strdup_printf ("%.4x", tablet->vid);
+  pid = g_strdup_printf ("%.4x", tablet->pid);
 
   master_name = g_strdup_printf ("Master pointer for %s", tablet->name);
   master = g_object_new (GDK_TYPE_WAYLAND_DEVICE,
@@ -2891,6 +2895,8 @@ tablet_handle_done (void                 *data,
                                 "display", display,
                                 "device-manager", device_manager,
                                 "seat", seat,
+                                "vendor-id", vid,
+                                "product-id", pid,
                                 NULL);
 
   eraser_device = g_object_new (GDK_TYPE_WAYLAND_DEVICE,
@@ -2902,6 +2908,8 @@ tablet_handle_done (void                 *data,
                                 "display", display,
                                 "device-manager", device_manager,
                                 "seat", seat,
+                                "vendor-id", vid,
+                                "product-id", pid,
                                 NULL);
 
   tablet->master = master;
@@ -2925,6 +2933,8 @@ tablet_handle_done (void                 *data,
 
   g_free (eraser_name);
   g_free (master_name);
+  g_free (vid);
+  g_free (pid);
 }
 
 static void